Change 'Ok' to 'Select' in the color chooser dialog

We have meaningful labels for the Ok buttons in all other choosers,
so just use the same string we use in the app chooser and the
font chooser.

Also move the mnemonic from s to a in 'Saturation', to avoid a
mnemonic conflict. String change !

https://bugzilla.gnome.org/show_bug.cgi?id=657006

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index c83279a335cd585f0ad984eb79ec12adc43076a6..af12bcb8b2ea4e3cdceff3b4980e5bc4b92dc30f 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -452,7 +452,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   make_label_spinbutton (colorsel, &priv->hue_spinbutton, _("_Hue:"), table, 0, 0, COLORSEL_HUE,
                          _("Position on the color wheel."));
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (priv->hue_spinbutton), TRUE);
-  make_label_spinbutton (colorsel, &priv->sat_spinbutton, _("_Saturation:"), table, 0, 1, COLORSEL_SATURATION,
+  make_label_spinbutton (colorsel, &priv->sat_spinbutton, _("S_aturation:"), table, 0, 1, COLORSEL_SATURATION,
                          _("Intensity of the color."));
   make_label_spinbutton (colorsel, &priv->val_spinbutton, _("_Value:"), table, 0, 2, COLORSEL_VALUE,
                          _("Brightness of the color."));

diff --git a/gtk/gtkcolorseldialog.c b/gtk/gtkcolorseldialog.c
index 627efa97c303079420330650811a4709fb8e66f6..a8a77e7177adbb8be27f188802d4c3b9f5632c97 100644 (file)
--- a/gtk/gtkcolorseldialog.c
+++ b/gtk/gtkcolorseldialog.c
@@ -190,17 +190,17 @@ gtk_color_selection_dialog_init (GtkColorSelectionDialog *colorseldiag)
   gtk_color_selection_set_has_opacity_control (GTK_COLOR_SELECTION (priv->colorsel), FALSE);
   gtk_container_add (GTK_CONTAINER (content_area), priv->colorsel);
   gtk_widget_show (priv->colorsel);
-  
+
   priv->cancel_button = gtk_dialog_add_button (dialog,
                                                GTK_STOCK_CANCEL,
                                                GTK_RESPONSE_CANCEL);
 
   priv->ok_button = gtk_dialog_add_button (dialog,
-                                           GTK_STOCK_OK,
+                                           _("_Select"),
                                            GTK_RESPONSE_OK);
-                                                   
+
   gtk_widget_grab_default (priv->ok_button);
-  
+
   priv->help_button = gtk_dialog_add_button (dialog,
                                              GTK_STOCK_HELP,
                                              GTK_RESPONSE_HELP);